Don't implement popup_menu in GtkWindow

This leads to disastruous results, since each menu is itself
in a GtkWindow, so holding down the menu key leads to a neverending
cascade of menus on top of menus.

https://bugzilla.gnome.org/show_bug.cgi?id=722106

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c2665c9d19dc30b9a11c6c631b3421c115606e0d..dcbe1154ae9024ec14de258918e18e2223860e5a 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -493,7 +493,6 @@ static void        gtk_window_on_theme_variant_changed (GtkSettings *settings,
 #endif
 static void        gtk_window_set_theme_variant         (GtkWindow  *window);
 
-static gboolean    gtk_window_popup_menu       (GtkWidget      *widget);
 static void        gtk_window_do_popup         (GtkWindow      *window,
                                                 GdkEventButton *event);
 
@@ -682,7 +681,6 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->direction_changed = gtk_window_direction_changed;
   widget_class->state_changed = gtk_window_state_changed;
   widget_class->style_updated = gtk_window_style_updated;
-  widget_class->popup_menu = gtk_window_popup_menu;
   widget_class->get_preferred_width = gtk_window_get_preferred_width;
   widget_class->get_preferred_width_for_height = gtk_window_get_preferred_width_for_height;
   widget_class->get_preferred_height = gtk_window_get_preferred_height;
@@ -8307,14 +8305,6 @@ gtk_window_do_popup (GtkWindow      *window,
                     0, gtk_get_current_event_time ());
 }
 
-static gboolean
-gtk_window_popup_menu (GtkWidget *widget)
-{
-  gtk_window_do_popup (GTK_WINDOW (widget), NULL);
-
-  return TRUE;
-}
-
 /*********************************
  * Functions related to resizing *
  *********************************/